aboutsummaryrefslogtreecommitdiffstats
path: root/src/routes/(app)/payment/[id]
diff options
context:
space:
mode:
authorAdam Soltys <[email protected]>2023-12-06 20:33:45 -0800
committerAdam Soltys <[email protected]>2023-12-06 20:33:45 -0800
commit6b3ff247e4125941a611369ed9bb74a2ffca57d8 (patch)
tree91da939350398188834e5e002bc78011a2a8e5bf /src/routes/(app)/payment/[id]
parentbb59ac3e4e7fcbf7f8a48820eab0ee21558183fc (diff)
parentd69c34cf389639eac82d24d1f1b02f038ef42399 (diff)
downloadcoinos-ui-6b3ff247e4125941a611369ed9bb74a2ffca57d8.tar.gz
coinos-ui-6b3ff247e4125941a611369ed9bb74a2ffca57d8.zip
Merge branch 'master' into swapee
Diffstat (limited to 'src/routes/(app)/payment/[id]')
-rw-r--r--src/routes/(app)/payment/[id]/+page.server.js6
-rw-r--r--src/routes/(app)/payment/[id]/+page.svelte273
-rw-r--r--src/routes/(app)/payment/[id]/plain/+page.server.js6
-rw-r--r--src/routes/(app)/payment/[id]/plain/+page.svelte88
-rw-r--r--src/routes/(app)/payment/[id]/print/+server.js8
5 files changed, 257 insertions, 124 deletions
diff --git a/src/routes/(app)/payment/[id]/+page.server.js b/src/routes/(app)/payment/[id]/+page.server.js
index 1c90ab69..5a364c65 100644
--- a/src/routes/(app)/payment/[id]/+page.server.js
+++ b/src/routes/(app)/payment/[id]/+page.server.js
@@ -1,6 +1,6 @@
-import { auth, get } from '$lib/utils';
+import { auth, get } from "$lib/utils";
export async function load({ cookies, params }) {
- let payment = await get(`/payments/${params.id}`, auth(cookies));
- return { payment };
+ let payment = await get(`/payments/${params.id}`, auth(cookies));
+ return { payment };
}
diff --git a/src/routes/(app)/payment/[id]/+page.svelte b/src/routes/(app)/payment/[id]/+page.svelte
index 12bb1c2d..fd5bbae0 100644
--- a/src/routes/(app)/payment/[id]/+page.svelte
+++ b/src/routes/(app)/payment/[id]/+page.svelte
@@ -1,135 +1,174 @@
<script>
- import { t } from '$lib/translations';
- import { back, copy, f, s, fiat, post, sats, success, types } from '$lib/utils';
- import { Avatar, Icon } from '$comp';
- import { format } from 'date-fns';
- import { PUBLIC_EXPLORER as expl } from '$env/static/public';
+ import { t } from "$lib/translations";
+ import {
+ back,
+ copy,
+ f,
+ s,
+ fiat,
+ post,
+ sats,
+ success,
+ types,
+ } from "$lib/utils";
+ import Avatar from "$comp/Avatar.svelte";
+ import Icon from "$comp/Icon.svelte";
+ import { format } from "date-fns";
+ import { PUBLIC_EXPLORER as expl } from "$env/static/public";
- export let data;
- let { user, payment: p } = data;
+ export let data;
+ let { user, payment: p } = data;
- let { username } = user;
- let { id, amount, created, rate, type, ref, tip, ourfee, fee, currency } = p;
- let a = Math.abs(amount);
+ let { username } = user;
+ let { id, amount, created, rate, type, ref, tip, ourfee, fee, currency } = p;
+ let a = Math.abs(amount);
- let print = async () => {
- await post(`/payment/${id}/print`, { id });
- success('Printing!');
- };
+ let print = async () => {
+ await post(`/payment/${id}/print`, { id });
+ success("Printing!");
+ };
- fee = fee || 0;
+ fee = fee || 0;
+
+ let direction = amount > 0 ? $t("payments.from") : $t("payments.to");
+ direction =
+ direction[0].toUpperCase() + direction.substr(1, direction.length);
</script>
-<button class="ml-5 md:ml-20 mt-5 md:mt-10 hover:opacity-80" on:click={back}>
- <Icon icon="arrow-left" style="w-10" />
-</button>
+<a href={`/${username}/payments`}>
+ <button class="ml-5 md:ml-20 mt-5 md:mt-10 hover:opacity-80">
+ <Icon icon="arrow-left" style="w-10" />
+ </button>
+</a>
<div class="container mx-auto max-w-lg px-4 space-y-8 break-all text-2xl">
- <h1 class="px-3 md:px-0 text-center text-3xl md:text-4xl font-semibold mb-10">
- {$t(amount < 0 ? 'payments.sent' : 'payments.received')}
- </h1>
+ <h1 class="px-3 md:px-0 text-center text-3xl md:text-4xl font-semibold mb-10">
+ {$t(amount < 0 ? "payments.sent" : "payments.received")}
+ </h1>
- {#if p.with}
- <div>
- <span class="text-lg text-secondary my-auto mr-2">{amount > 0 ? 'From' : 'To'}</span>
- <a href={`/${p.with.username}`}>
- <div class="flex">
- <div class="my-auto">
- <Avatar user={p.with} size={20} />
- </div>
- <div class="my-auto ml-1">{p.with.username}</div>
- </div>
- </a>
- </div>
- {/if}
- {#if p.type === types.pot}
- <div>
- <span class="text-lg text-secondary my-auto mr-2">{amount > 0 ? 'From' : 'To'}</span>
- <a href={`/pot/${p.memo}`}>
- <div class="flex">
- <div class="my-auto">
- <img src="/images/moneypot.png" class="w-12" alt="Pot" />
- </div>
- <div class="my-auto ml-1">{p.memo}</div>
- </div>
- </a>
- </div>
- {/if}
- <div>
- <span class="text-lg text-secondary">Amount</span>
- <div>
- {f(fiat(a, rate), currency)}
- <span class="text-secondary text-lg">
- ⚡️{s(a)}
- </span>
- </div>
- </div>
+ {#if p.with}
+ <div>
+ <span class="text-lg text-secondary my-auto mr-2">{direction}</span>
+ <a href={`/${p.with.username}`}>
+ <div class="flex">
+ <div class="my-auto">
+ <Avatar user={p.with} size={20} />
+ </div>
+ <div class="my-auto ml-1">{p.with.username}</div>
+ </div>
+ </a>
+ </div>
+ {/if}
+ {#if p.type === types.fund}
+ <div>
+ <span class="text-lg text-secondary my-auto mr-2">{direction}</span>
+ <a href={`/fund/${p.memo}`}>
+ <div class="flex">
+ <div class="my-auto">
+ <img src="/images/moneypot.png" class="w-12" alt="Pot" />
+ </div>
+ <div class="my-auto ml-1">{p.memo}</div>
+ </div>
+ </a>
+ </div>
+ {/if}
+ <div>
+ <span class="text-lg text-secondary">{$t("payments.amount")}</span>
+ <div>
+ {f(fiat(a, rate), currency)}
+ <span class="text-secondary text-lg">
+ ⚡️{s(a)}
+ </span>
+ </div>
+ </div>
- {#if tip}
- <div>
- <span class="text-lg text-secondary">Tip</span>
- <div>
- {f(fiat(tip, rate), currency)}
- ({Math.round((tip * 100) / Math.abs(a))}%)
- <span class="text-secondary text-lg">
- ⚡️{s(tip)}
- </span>
- </div>
- </div>
+ {#if tip}
+ <div>
+ <span class="text-lg text-secondary">{$t("invoice.tip")}</span>
+ <div>
+ {f(fiat(tip, rate), currency)}
+ ({Math.round((tip * 100) / Math.abs(a))}%)
+ <span class="text-secondary text-lg">
+ ⚡️{s(tip)}
+ </span>
+ </div>
+ </div>
- <div>
- <span class="text-lg text-secondary">Total</span>
- <div>
- {f(fiat(a + (tip || 0), rate), currency)}
- <span class="text-secondary text-lg">⚡️{`${s(a + (tip || 0))}`} </span>
- </div>
- </div>
- {/if}
+ <div>
+ <span class="text-lg text-secondary">Total</span>
+ <div>
+ {f(fiat(a + (tip || 0), rate), currency)}
+ <span class="text-secondary text-lg">⚡️{`${s(a + (tip || 0))}`} </span>
+ </div>
+ </div>
+ {/if}
- <div>
- <span class="text-lg text-secondary">Network fee</span>
- <div>
- {f(fiat(fee, rate), currency)}
- <span class="text-secondary text-lg">⚡️{`${s(fee)}`}</span>
- </div>
- </div>
+ <div>
+ <span class="text-lg text-secondary">Network fee</span>
+ <div>
+ {f(fiat(fee, rate), currency)}
+ <span class="text-secondary text-lg">⚡️{`${s(fee)}`}</span>
+ </div>
+ </div>
- {#if ourfee > 0}
- <div>
- <span class="text-lg text-secondary">Platform fee</span>
- <div>
- {f(fiat(ourfee, rate), currency)}
- <span class="text-secondary">⚡️{`${s(ourfee)}`}</span>
- </div>
- </div>
- {/if}
+ {#if ourfee > 0}
+ <div>
+ <span class="text-lg text-secondary">Platform fee</span>
+ <div>
+ {f(fiat(ourfee, rate), currency)}
+ <span class="text-secondary">⚡️{`${s(ourfee)}`}</span>
+ </div>
+ </div>
+ {/if}
- <div>
- <span class="text-lg text-secondary">Date</span>
- <div>
- {format(new Date(created), 'MMMM d')},
- {format(new Date(created), 'h:mm aaa')}
- </div>
- </div>
+ <div>
+ <span class="text-lg text-secondary">Date</span>
+ <div>
+ {format(new Date(created), "MMMM d")},
+ {format(new Date(created), "h:mm aaa")}
+ </div>
+ </div>
- {#if type === 'bitcoin'}
- <div>
- <span class="text-lg text-secondary">Txid</span>
- <div class="flex">
- <div>
- <a href={`${expl}/tx/${id}`} target="_blank" rel="noreferrer">{id}</a>
- </div>
- <button class="flex font-bold hover:opacity-80 mb-auto my-auto" on:click={() => copy(id)}
- ><Icon icon="copy" style="ml-2 w-20 my-auto" />
- </button>
- </div>
- </div>
- {/if}
+ {#if type === "bitcoin"}
+ <div>
+ <span class="text-lg text-secondary">Txid</span>
+ <div class="flex">
+ <div>
+ <a href={`${expl}/tx/${id}`} target="_blank" rel="noreferrer">{id}</a>
+ </div>
+ <button
+ class="flex font-bold hover:opacity-80 mb-auto my-auto"
+ on:click={() => copy(id)}
+ ><Icon icon="copy" style="ml-2 w-20 my-auto" />
+ </button>
+ </div>
+ </div>
+ {/if}
- {#if ['laughingbean', 'burnabyartigiano', 'milanowestend', 'eotl', 'bigbite', 'edgemontartigiano'].includes(user.username.toLowerCase())}
- <button
- class="text-sm md:text-lg rounded-full border py-2 px-4 hover:opacity-80 min-w-[72px] bg-black text-white"
- on:click={print}>Print Receipt</button
- >
- {/if}
+ {#if user.hasprinter}
+ <div>
+ <button
+ class="rounded-full border py-3 px-6 hover:opacity-80 flex w-full md:w-60"
+ on:click={print}
+ >
+ <div class="mx-auto flex">
+ <Icon icon="printer" style="my-auto h-6 mr-2" />
+ <div class="my-auto mt-1 text-base">{$t("payments.print")}</div>
+ </div>
+ </button>
+ </div>
+ {:else}
+ <div>
+ <a href={`/payment/${id}/plain`}>
+ <button
+ class="rounded-full border py-3 px-6 hover:opacity-80 flex w-full md:w-60"
+ >
+ <div class="mx-auto flex">
+ <Icon icon="printer" style="my-auto h-6 mr-2" />
+ <div class="my-auto mt-1 text-base">{$t("payments.print")}</div>
+ </div>
+ </button>
+ </a>
+ </div>
+ {/if}
</div>
diff --git a/src/routes/(app)/payment/[id]/plain/+page.server.js b/src/routes/(app)/payment/[id]/plain/+page.server.js
new file mode 100644
index 00000000..5a364c65
--- /dev/null
+++ b/src/routes/(app)/payment/[id]/plain/+page.server.js
@@ -0,0 +1,6 @@
+import { auth, get } from "$lib/utils";
+
+export async function load({ cookies, params }) {
+ let payment = await get(`/payments/${params.id}`, auth(cookies));
+ return { payment };
+}
diff --git a/src/routes/(app)/payment/[id]/plain/+page.svelte b/src/routes/(app)/payment/[id]/plain/+page.svelte
new file mode 100644
index 00000000..c63a9d7f
--- /dev/null
+++ b/src/routes/(app)/payment/[id]/plain/+page.svelte
@@ -0,0 +1,88 @@
+<script>
+ import { goto } from "$app/navigation";
+ import { onMount } from "svelte";
+ import { browser } from "$app/environment";
+ import { t } from "$lib/translations";
+ import {
+ back,
+ copy,
+ f,
+ s,
+ fiat,
+ post,
+ sats,
+ success,
+ types,
+ } from "$lib/utils";
+ import Avatar from "$comp/Avatar.svelte";
+ import Icon from "$comp/Icon.svelte";
+ import { format } from "date-fns";
+ import { PUBLIC_EXPLORER as expl } from "$env/static/public";
+
+ export let data;
+ let { user, payment: p } = data;
+
+ let { username } = user;
+ let { id, amount, created, rate, type, ref, tip, ourfee, fee, currency } = p;
+ let a = Math.abs(amount);
+
+ onMount(() => {
+ if (browser) {
+ let main = document.querySelector("main");
+ main.style.paddingBottom = "0";
+ window.onfocus = () => goto(`/payment/${id}`);
+ window.print();
+ }
+ });
+
+ fee = fee || 0;
+</script>
+
+<div class="space-y-5">
+ <div>
+ <span class="text-lg text-secondary">Amount</span>
+ <div>
+ {f(fiat(a, rate), currency)}
+ </div>
+ </div>
+
+ {#if tip}
+ <div>
+ <span class="text-lg text-secondary">Tip</span>
+ <div>
+ {f(fiat(tip, rate), currency)}
+ ({Math.round((tip * 100) / Math.abs(a))}%)
+ </div>
+ </div>
+
+ <div>
+ <span class="text-lg text-secondary">Total</span>
+ <div>
+ {f(fiat(a + (tip || 0), rate), currency)}
+ </div>
+ </div>
+ {/if}
+
+ <div>
+ <span class="text-lg text-secondary">Date</span>
+ <div>
+ {format(new Date(created), "MMMM d")},
+ {format(new Date(created), "h:mm aaa")}
+ </div>
+ </div>
+
+ {#if type === "bitcoin"}
+ <div>
+ <span class="text-lg text-secondary">Txid</span>
+ <div class="flex">
+ <div>
+ {id}
+ </div>
+ </div>
+ </div>
+ {/if}
+</div>
+
+<a href={`/payment/${id}`}>
+ <div class="opacity-0 w-screen h-screen fixed top-0 left-0 z-50" />
+</a>
diff --git a/src/routes/(app)/payment/[id]/print/+server.js b/src/routes/(app)/payment/[id]/print/+server.js
index fde834d1..2fdfc8c1 100644
--- a/src/routes/(app)/payment/[id]/print/+server.js
+++ b/src/routes/(app)/payment/[id]/print/+server.js
@@ -1,7 +1,7 @@
-import { auth, post } from '$lib/utils';
-import { json } from '@sveltejs/kit';
+import { auth, post } from "$lib/utils";
+import { json } from "@sveltejs/kit";
export async function POST({ cookies, request }) {
- let body = await request.json();
- return json(post('/print', body, auth(cookies)));
+ let body = await request.json();
+ return json(post("/print", body, auth(cookies)));
}